From 658e7c45353d625dc30852f49fb92a1959f615fa Mon Sep 17 00:00:00 2001
From: Changwoo Ryu <cwryu@debian.org>
Date: Wed, 13 Feb 2013 02:44:00 +0000
Subject: [PATCH] immodule: Fix context ID lookup on module with multiple
 contexts

https://bugzilla.gnome.org/show_bug.cgi?id=690247
---
 gtk/gtkimmodule.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 0f45847c61..5e35498a22 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -646,12 +646,14 @@ lookup_immodule (gchar **immodules_list)
       if (g_strcmp0 (*immodules_list, SIMPLE_ID) == 0)
         return SIMPLE_ID;
       else
-       {
-         GtkIMModule *module;
-         module = g_hash_table_lookup (contexts_hash, *immodules_list);
-         if (module)
-           return module->contexts[0]->context_id;
-       }
+	{
+	  gboolean found;
+	  gchar *context_id;
+	  found = g_hash_table_lookup_extended (contexts_hash, *immodules_list,
+						&context_id, NULL);
+	  if (found)
+	    return context_id;
+	}
       immodules_list++;
     }
 
-- 
2.30.2